Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <[email protected]>
Sat, 15 Apr 2017 02:05:17 +0000 (22:05 -0400)
committerTom Rini <[email protected]>
Sat, 15 Apr 2017 02:05:17 +0000 (22:05 -0400)
1  2 
scripts/config_whitelist.txt

Simple merge